From: Stefan Monnier Date: Tue, 15 Sep 2009 04:08:02 +0000 (+0000) Subject: (custom-initialize-default, custom-initialize-set): CSE. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~10469 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cca209b4f973b2939ae219a2d75e868d6cc4bddb;p=emacs.git (custom-initialize-default, custom-initialize-set): CSE. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eeb90cb28c5..35eff3c3b98 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2009-09-15 Stefan Monnier + * custom.el (custom-initialize-default, custom-initialize-set): CSE. + * desktop.el (desktop-path): Check user-emacs-directory. * emacs-lisp/bytecomp.el (byte-compile-refresh-preloaded): New function. diff --git a/lisp/custom.el b/lisp/custom.el index f55cd47afc0..e3d3d9a63a0 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -57,9 +57,9 @@ Otherwise, VALUE will be evaluated and used as the default binding for symbol." (unless (default-boundp symbol) ;; Use the saved value if it exists, otherwise the standard setting. - (set-default symbol (if (get symbol 'saved-value) - (eval (car (get symbol 'saved-value))) - (eval value))))) + (set-default symbol (eval (if (get symbol 'saved-value) + (car (get symbol 'saved-value)) + value))))) (defun custom-initialize-set (symbol value) "Initialize SYMBOL based on VALUE. @@ -70,9 +70,9 @@ if any, or VALUE." (unless (default-boundp symbol) (funcall (or (get symbol 'custom-set) 'set-default) symbol - (if (get symbol 'saved-value) - (eval (car (get symbol 'saved-value))) - (eval value))))) + (eval (if (get symbol 'saved-value) + (car (get symbol 'saved-value)) + value))))) (defun custom-initialize-reset (symbol value) "Initialize SYMBOL based on VALUE.